From: Juanma Barranquero <lekktu@gmail.com>
Date: Mon, 11 Jun 2007 00:22:33 +0000 (+0000)
Subject: (server-switch-buffer): Remove redundant check.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18495
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e7decb071b484f8dd26b89a5a728ec58b1965d6d;p=emacs.git

(server-switch-buffer): Remove redundant check.
---

diff --git a/lisp/server.el b/lisp/server.el
index 690f51034f2..2cf2a2e3953 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -735,8 +735,7 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
                 (select-window win)
                 (set-buffer next-buffer))
 	    ;; Otherwise, let's find an appropriate window.
-	    (cond ((and (windowp server-window)
-			(window-live-p server-window))
+	    (cond ((window-live-p server-window)
 		   (select-window server-window))
 		  ((framep server-window)
 		   (unless (frame-live-p server-window)